$OpenBSD: patch-amavisd_conf,v 1.8 2014/06/19 22:17:32 sthen Exp $
--- amavisd.conf.orig	Thu Aug 30 16:00:16 2012
+++ amavisd.conf	Thu Jun 19 22:33:41 2014
@@ -14,12 +14,12 @@ use strict;
 # $bypass_decode_parts = 1;         # controls running of decoders&dearchivers
 
 $max_servers = 2;            # num of pre-forked children (2..30 is common), -m
-$daemon_user  = 'vscan';     # (no default;  customary: vscan or amavis), -u
-$daemon_group = 'vscan';     # (no default;  customary: vscan or amavis), -g
+$daemon_user  = '_vscan';     # (no default;  customary: _vscan or amavis), -u
+$daemon_group = '_vscan';     # (no default;  customary: _vscan or amavis), -g
 
 $mydomain = 'example.com';   # a convenient default for other settings
 
-# $MYHOME = '/var/amavis';   # a convenient default for other settings, -H
+$MYHOME = '/var/amavisd';   # a convenient default for other settings, -H
 $TEMPBASE = "$MYHOME/tmp";   # working directory, needs to exist, -T
 $ENV{TMPDIR} = $TEMPBASE;    # environment variable TMPDIR, used by SA, etc.
 $QUARANTINEDIR = '/var/virusmails';  # -Q
@@ -229,7 +229,7 @@ $banned_filename_re = new_RE(
 
   qr'.\.(exe|vbs|pif|scr|cpl)$'i,             # banned extension - basic
 # qr'.\.(exe|vbs|pif|scr|cpl|bat|cmd|com)$'i, # banned extension - basic+cmd
-# qr'.\.(ade|adp|app|bas|bat|chm|cmd|com|cpl|crt|emf|exe|fxp|grp|hlp|hta|
+# qr'.\.(ade|adp|app|bas|bat|chm|cmd|com|cpl|crt|emf|exe|fxp|gadget|grp|hlp|hta|
 #        inf|ini|ins|isp|js|jse|lib|lnk|mda|mdb|mde|mdt|mdw|mdz|msc|msi|
 #        msp|mst|ocx|ops|pcd|pif|prg|reg|scr|sct|shb|shs|sys|vb|vbe|vbs|vxd|
 #        wmf|wsc|wsf|wsh)$'ix,                # banned extensions - long
@@ -313,7 +313,7 @@ $banned_filename_re = new_RE(
 @decoders = (
   ['mail', \&do_mime_decode],
 # [[qw(asc uue hqx ync)], \&do_ascii],  # not safe
-  ['F',    \&do_uncompress, ['unfreeze', 'freeze -d', 'melt', 'fcat'] ],
+# ['F',    \&do_uncompress, ['unfreeze', 'freeze -d', 'melt', 'fcat'] ],
   ['Z',    \&do_uncompress, ['uncompress', 'gzip -d', 'zcat'] ],
   ['gz',   \&do_uncompress, 'gzip -d'],
   ['gz',   \&do_gunzip],
@@ -331,8 +331,8 @@ $banned_filename_re = new_RE(
            # ['/usr/local/heirloom/usr/5bin/pax', 'pax', 'gcpio', 'cpio']
   ['deb',  \&do_ar, 'ar'],
 # ['a',    \&do_ar, 'ar'],  # unpacking .a seems an overkill
-  ['rar',  \&do_unrar, ['unrar', 'rar'] ],
-  ['arj',  \&do_unarj, ['unarj', 'arj'] ],
+  ['rar',  \&do_7zip, ['7z'] ],
+  ['arj',  \&do_7zip, ['7z'] ],
   ['arc',  \&do_arc,   ['nomarch', 'arc'] ],
   ['zoo',  \&do_zoo,   ['zoo', 'unzoo'] ],
   ['doc',  \&do_ole,   'ripole'],
